Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 22:42:15 +0000 (22:42 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 22:42:15 +0000 (22:42 +0000)

Trivial merge